debian/patches: Add a patch to use python3 explicitly

diff --git a/debian/control b/debian/control
index c8d21a633460c839cb87480e5ebd040b43bea3e3..36f3e296d087ee53208cb29ca7e8d1835156c96d 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Build-Depends:
  doxygen,
  libjs-jquery,
  libtclap-dev,
- python,
+ python3:any,
  rapidjson-dev,
 Standards-Version: 4.4.0
 Section: libs

diff --git a/debian/patches/0004-data-Explicitly-use-python3.patch b/debian/patches/0004-data-Explicitly-use-python3.patch
new file mode 100644 (file)
index 0000000..0ce0798
--- /dev/null
+++ b/debian/patches/0004-data-Explicitly-use-python3.patch
@@ -0,0 +1,79 @@
+From: Boyuan Yang <byang@debian.org>
+Date: Fri, 30 Aug 2019 13:51:12 -0400
+Subject: data/: Explicitly use python3
+
+Before "python" is default to python3, this patch should be kept.
+
+Last-Update: 2019-08-30
+---
+ data/CMakeLists.txt         | 4 ++--
+ data/scripts/find_target.py | 2 +-
+ data/scripts/merge.py       | 2 +-
+ data/scripts/reverse.py     | 2 +-
+ data/scripts/sort.py        | 2 +-
+ data/scripts/sort_all.py    | 2 +-
+ 6 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
+index 1516775..3989bad 100644
+--- a/data/CMakeLists.txt
++++ b/data/CMakeLists.txt
+@@ -1,6 +1,6 @@
+ set(OPENCC_DICT_BIN opencc_dict)
+-set(DICT_MERGE_BIN python ${CMAKE_CURRENT_SOURCE_DIR}/scripts/merge.py)
+-set(DICT_REVERSE_BIN python ${CMAKE_CURRENT_SOURCE_DIR}/scripts/reverse.py)
++set(DICT_MERGE_BIN python3 ${CMAKE_CURRENT_SOURCE_DIR}/scripts/merge.py)
++set(DICT_REVERSE_BIN python3 ${CMAKE_CURRENT_SOURCE_DIR}/scripts/reverse.py)
+ set(DICT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/dictionary)
+ set(DICT_GENERATED_DIR ${CMAKE_CURRENT_BINARY_DIR})
+ 
+diff --git a/data/scripts/find_target.py b/data/scripts/find_target.py
+index 28ada27..ffb3704 100755
+--- a/data/scripts/find_target.py
++++ b/data/scripts/find_target.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python3
+ #coding: utf-8
+ import sys
+ from common import find_target_items
+diff --git a/data/scripts/merge.py b/data/scripts/merge.py
+index 170bf60..4200b8b 100755
+--- a/data/scripts/merge.py
++++ b/data/scripts/merge.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python3
+ #coding: utf-8
+ import codecs
+ import sys
+diff --git a/data/scripts/reverse.py b/data/scripts/reverse.py
+index f702460..2a47a9e 100755
+--- a/data/scripts/reverse.py
++++ b/data/scripts/reverse.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python3
+ #coding: utf-8
+ import sys
+ from common import reverse_items
+diff --git a/data/scripts/sort.py b/data/scripts/sort.py
+index 8268bde..1585ccb 100755
+--- a/data/scripts/sort.py
++++ b/data/scripts/sort.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python3
+ #coding: utf-8
+ import sys
+ from common import sort_items
+diff --git a/data/scripts/sort_all.py b/data/scripts/sort_all.py
+index 0cecdaa..2cad6f9 100755
+--- a/data/scripts/sort_all.py
++++ b/data/scripts/sort_all.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python3
+ #coding: utf-8
+ import glob
+ import sys

diff --git a/debian/patches/series b/debian/patches/series
index fe4adf11c95b05daee1e8f973305e79301db4725..a39058bdbe3d06c3e11b68298ebcf9080c5fcdaa 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 lib-name-match-soversion.patch
 use-system-libraries.patch
 use-cmake-install-libdir.patch
+0004-data-Explicitly-use-python3.patch